Merge pull request #561 from antonio-nino-diaz-arm/an/bootwrapper

Enable preloaded BL33 alternative boot flow

diff --cc Makefile
Simple merge

diff --cc docs/porting-guide.md
Simple merge

diff --cc docs/user-guide.md
Simple merge